merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Jul 2006 16:49:32 +0000 (10:49 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Wed, 26 Jul 2006 16:49:32 +0000 (10:49 -0600)
commitd2ac905a14b5a353c296b47425283553de2d45aa
tree004cdd112e31eca594a4d61eaf92c1f84e257761
parent0adf62a2ae5c774eb9d3c1e0b24935feb8c23a4d
parentf450023e012692d6ec2a9a364953244839dbd2fc
merge with xen-unstable.hg